Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: added timers for defrag powerups #129

Merged
merged 3 commits into from
Apr 17, 2024
Merged

Conversation

Mac-tf2
Copy link
Member

@Mac-tf2 Mac-tf2 commented Apr 15, 2024

Closes momentum-mod/game/issues/1848
Closes momentum-mod/game/issues/1727

Checks

  • I have thoroughly tested all of the code I have modified/added/removed to ensure something else did not break
  • I have followed semantic commit messages e.g. feat: Add foo, chore: Update bar, etc...
  • My branch has a clear history of changes that can be easy to follow when being reviewed commit-by-commit
  • My branch is functionally complete; the only changes to be done will be those potentially requested in code review
  • All changes requested in review have been fixuped into my original commits.

@Mac-tf2
Copy link
Member Author

Mac-tf2 commented Apr 15, 2024

image

@Mac-tf2 Mac-tf2 force-pushed the feat/poweruptimer branch from 672780f to b84d0b6 Compare April 15, 2024 10:08
@Mac-tf2 Mac-tf2 force-pushed the feat/poweruptimer branch from b84d0b6 to 3c82dc6 Compare April 15, 2024 10:45
layout/hud/powerup-timer.xml Show resolved Hide resolved
@tsa96 tsa96 force-pushed the feat/poweruptimer branch from e107d6d to 83cbad1 Compare April 15, 2024 11:06
@tsa96 tsa96 force-pushed the feat/poweruptimer branch from 83cbad1 to 3865afa Compare April 15, 2024 12:57
@tsa96 tsa96 requested a review from PeenScreeker April 15, 2024 13:03
@tsa96
Copy link
Member

tsa96 commented Apr 15, 2024

I'm happy with Mac's stuff but seeing as I rewrote half of it with him and this PR now has a commit of my own, def needs a review from someone else - Peen if you can check it out that'd be great. Also I have a PR on red for getting the ShouldDraw stuff for hud panels working with my thing.

Copy link
Member

@PeenScreeker PeenScreeker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks great!

@PeenScreeker PeenScreeker merged commit b59d86c into master Apr 17, 2024
1 check passed
@PeenScreeker PeenScreeker deleted the feat/poweruptimer branch April 17, 2024 03:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Defrag: Damage boost HUD indicator Defrag: Haste HUD status indicator
3 participants